Merge "images/.htaccess breaks TransformVia404 functionality"

diff --git a/images/.htaccess b/images/.htaccess
index 8c46bbb..3f3d41e 100644 (file)
--- a/images/.htaccess
+++ b/images/.htaccess
@@ -1,6 +1,7 @@
 # Protect against bug 28235
 <IfModule rewrite_module>
        RewriteEngine On
+       RewriteOptions inherit
        RewriteCond %{QUERY_STRING} \.[^\\/:*?\x22<>|%]+(#|\?|$) [nocase]
        RewriteRule . - [forbidden]
        # Fix for bug T64289